auto merge of #768 : alexcrichton/cargo/ssl-fixes, r=brson
authorbors <bors@rust-lang.org>
Wed, 29 Oct 2014 18:49:43 +0000 (18:49 +0000)
committerbors <bors@rust-lang.org>
Wed, 29 Oct 2014 18:49:43 +0000 (18:49 +0000)
The second commit message has the details, and these are the relevant external commits:

* https://github.com/alexcrichton/openssl-static-sys/commit/2e1c50a7f35ef52ce38dbd405a175b6dccc0ebad
* https://github.com/alexcrichton/curl-rust/commit/1098e4dd3b89b168b412dfeaba033e41796ea794


Trivial merge